Remove some warnings.

2004-11-07  Matthias Clasen  <mclasen@redhat.com>

	* gtk/gtkmenu.c (menu_change_screen): Remove some warnings.

diff --git a/ChangeLog b/ChangeLog
index 4324da0c3755bc632d5957e1604813f7f296589e..0b3868756b97fea3771b3bc10a3e187925c3e5c3 100644 (file)
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
 2004-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Remove some warnings.
+
        Show files in folder modes. (#157013, Nickolay V. Shmyrev)
        
        * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection

diff --git a/ChangeLog.pre-2-10 b/ChangeLog.pre-2-10
index 4324da0c3755bc632d5957e1604813f7f296589e..0b3868756b97fea3771b3bc10a3e187925c3e5c3 100644 (file)
--- a/ChangeLog.pre-2-10
+++ b/ChangeLog.pre-2-10
@@ -1,5 +1,7 @@
 2004-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Remove some warnings.
+
        Show files in folder modes. (#157013, Nickolay V. Shmyrev)
        
        * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection

diff --git a/ChangeLog.pre-2-6 b/ChangeLog.pre-2-6
index 4324da0c3755bc632d5957e1604813f7f296589e..0b3868756b97fea3771b3bc10a3e187925c3e5c3 100644 (file)
--- a/ChangeLog.pre-2-6
+++ b/ChangeLog.pre-2-6
@@ -1,5 +1,7 @@
 2004-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Remove some warnings.
+
        Show files in folder modes. (#157013, Nickolay V. Shmyrev)
        
        * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection

diff --git a/ChangeLog.pre-2-8 b/ChangeLog.pre-2-8
index 4324da0c3755bc632d5957e1604813f7f296589e..0b3868756b97fea3771b3bc10a3e187925c3e5c3 100644 (file)
--- a/ChangeLog.pre-2-8
+++ b/ChangeLog.pre-2-8
@@ -1,5 +1,7 @@
 2004-11-07  Matthias Clasen  <mclasen@redhat.com>
 
+       * gtk/gtkmenu.c (menu_change_screen): Remove some warnings.
+
        Show files in folder modes. (#157013, Nickolay V. Shmyrev)
        
        * gtk/gtkfilechooserdefault.c (create_file_list): Use a selection

diff --git a/gtk/gtkmenu.c b/gtk/gtkmenu.c
index 3dd53c8fa83f55ed40a9f84af1a1ab984094fcf2..5e067cd7dee3faa6ff57613fa7cf436884ec1d9b 100644 (file)
--- a/gtk/gtkmenu.c
+++ b/gtk/gtkmenu.c
@@ -980,9 +980,9 @@ menu_change_screen (GtkMenu   *menu,
 {
   GtkMenuPrivate *private = gtk_menu_get_private (menu);
 
-  if (gtk_widget_has_screen (menu))
+  if (gtk_widget_has_screen (GTK_WIDGET (menu)))
     {
-      if (new_screen == gtk_widget_get_screen (menu))
+      if (new_screen == gtk_widget_get_screen (GTK_WIDGET (menu)))
        return;
     }